From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 19 Oct 2009 09:47:09 +0000 (+0100)
Subject: xm: Fix xm network2-{attach,detach}
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13210
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=c288a6ff89fe779d7bbd1f4144b77a7c16073667;p=xen.git

xm: Fix xm network2-{attach,detach}

"xm help" is aborted due to a missing comma.
Some fixes in passing.
- less help message.
- typo.

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
---

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 07f77bf29e..8372b08f58 100644
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -184,7 +184,8 @@ SUBCOMMAND_HELP = {
     'network2-attach': ('<Domain> [front_mac=<mac>] [back_mac=<mac>] '
                         '[backend=<BackDomain>] [trusted=<0|1>] '
                         '[back_trusted=<0|1>] [bridge=<bridge>] '
-                        '[max_bypasses=n]'
+                        '[filter_mac=<0|1>] [front_filter_mac=<0|1>] '
+                        '[pdev=<PDEV>] [max_bypasses=n]',
                         'Create a new version 2 virtual network device.'),
     'network2-detach': ('<Domain> <DevId> [-f|--force]',
                          'Destroy a domain\'s version 2 virtual network device.'),
@@ -2450,7 +2451,7 @@ def xm_block_configure(args):
 
 def xm_network2_attach(args):
     xenapi_unsupported()
-    arg_check(args, 'network2-attach', 1, 4)
+    arg_check(args, 'network2-attach', 1, 11)
     dom = args[0]
     vif = ['vif2']
     vif_params = ['front_mac', 'back_mac', 'backend', 'trusted',
@@ -2467,7 +2468,7 @@ def xm_network2_attach(args):
 
 def xm_network2_detach(args):
     xenapi_unsupported()
-    arg_check(args, "network2-detch", 2, 3)
+    arg_check(args, "network2-detach", 2, 3)
     detach(args, "vif2")
 
 def xm_network2_list(args):